fix the red conflict thjngys