removed merge bugs