Deleted merge conflicts. Now we are back on track <3