Fixed Conflicting Commits