Merge conflict resolution
Resolve issue with granch merging
Make work