removed merge conflicts, added assets