Raise to function commit
Merged conflict files