Whoops! Merge conflicts fixed :D