Solving Conflits
Merged after conflicts