stupid conflict messed up the code... fixing