moved .openshift directory into a backup dir to see if this would resolve the merge conflicts i'm getting when trying to commit this to openshift.