Resolve weird git merges