Cleanup commit, to resolve conflits