Fixed Mistakes when merging branches