peter changes
resolving conflicts