merge commit - compilation issues resolved