merge with PSD design