Please fix this GIT merge mess :)