fixed #236 caused by me not resolving conflicts properly before