Fixed merge conflicts left in file