resolve issues
fixed merge issues
RESOLVED CONFLICTS