Commit before merge
Fixed conflicts