Removed merge bugs