Resolving merge fault