Trying to merge again
Moving files around
Changing state