Simple working solution
Fix merge conflict