Remove bug in merging development