Solved 2 merge errors