Remove conditional
Set alignment
Merge local modifications