Merge feedback plz

Due to us not currently having the tech we cannot give an estimate in time if or when merges will happen.