added podfile, circle head
fixed conflict