Change weird merge problems in file!!!