Removed merge-conflict code