Fixed merges errors