How do I resolve a merge conflict with features?
Check the panes with the following uuid "bf806592-c85c-4155-a97c-516f72427e4e" 
and "992af322-74c5-4a5c-a261-1e73677d3645".
Check which one should not be there and remove it from the code.