temp fix for merge problem