Fixed merge fault