fixing an issue when merging branches