Fix template after conflict.