Cleaning mess
Resolving conflicts