Fixed merge conflicts for hildur