Removed merge-related errors