had some merge problems hope they were fixed