fixing merge
merge fixed aparently