Added ignoring merges