re-installed parse
resolved merge conflict
updated lock and adjusted layer alpha