conflicting commit to branch
Merge branch 'feature_1'

Conflicts:
	some_file.php