Commit Fixed with merging error