Fixed mere conflicts