Uploaded right files and design sheets, html, pictures, and so forth
resolved conflicts