last changes being committed before pull
merged with head and conflict resolved