Removed merge code