Code after resolving conflicts