conflicts all resolved