added treasure hunt
resolved conflicts