Corrected merge bug