bug fixed to merge correctly