Source code committed after resolving conflicts