Made fix so that files are automatically merged on updates of application.
Made fix so that files are automatically merged on updates of application.

FrancisBaileyH/Garden-Wall,FrancisBaileyH/Garden-Wall