Merge conflicts & CleanUp