Removed merge errors