improving the UI
fixing merge conflict