Improved merge, updated alpaca