Added skipping merges by default