Removed commented out merge errors