Attempt to resolve merge conflict. I hope i won't break something.