Resolving conflicts on Makefile
Refactoring daemon