resolving merge issues. please check and see if it works ok