moved my things to a different file
fixed hte conflict