confirmed all merges between origin and local master copy