Need help merging code