Added the mockups folder with the psd file.
Resolved merge issues.