resolve merging issue
fixed more merge issues