Third Time Commit
Solved the conficts