Corrected merge confict changes