All working now
getting rid of accidentally commited merge files