fixed error when merging branches