git, stop screwing w/ me and merge!