Committed Adrians changes and resolved conflicts