weird git errors with merging...