there will be merge conflicts. Fixing them
fixing merge conficts