Removed some merge conflict and some minor changes