Layout changed. This file should be added to the ignore I think.
Fixed merge problem with layout file.