Commiting my things
Resolve conflict