More layer methods.
Conflict resolution.