Resolving fucking merge conflicts