Salds working
merge fixing